Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge dev16.0-preview2-vs-deps to master-vs-deps #32196

Merged
5 commits merged into from
Jan 8, 2019

Conversation

dotnet-bot
Copy link
Collaborator

This is an automatically generated pull request from dev16.0-preview2-vs-deps into master-vs-deps.

git fetch --all
git checkout merges/dev16.0-preview2-vs-deps-to-master-vs-deps
git reset --hard upstream/master-vs-deps
git merge upstream/dev16.0-preview2-vs-deps
# Fix merge conflicts
git commit
git push merges/dev16.0-preview2-vs-deps-to-master-vs-deps --force

Once all conflicts are resolved and all the tests pass, you are free to merge the pull request.

chsienki and others added 5 commits January 4, 2019 14:08
- Restore previous message to remove any mention of 'public void-returning Dispose method'
- Update test comments to match
Change no conversion to idisposable message
…6.0-preview2-vs-deps

Merge dev16.0-preview2 to dev16.0-preview2-vs-deps
@sharwell

This comment has been minimized.

@JoeRobich JoeRobich closed this Jan 8, 2019
@JoeRobich JoeRobich reopened this Jan 8, 2019
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-approval

@ghost ghost merged commit f53cbad into master-vs-deps Jan 8, 2019
@ghost ghost deleted the merges/dev16.0-preview2-vs-deps-to-master-vs-deps branch January 8, 2019 03:00
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants